Stop using gtk_file_filter_filter

Make all users of GtkFileFilter use it via the
GtkFilter api. This is in preparation for dropping
gtk_filter_filter_filter.

diff --git a/gtk/gtkfilechooserentry.c b/gtk/gtkfilechooserentry.c
index f4871344d394ae3e43edb2895c315783a5e94d41..28bba7de32e8bc74ad673a7bb117936b1e93b82a 100644 (file)
--- a/gtk/gtkfilechooserentry.c
+++ b/gtk/gtkfilechooserentry.c
@@ -209,7 +209,7 @@ match_func (GtkEntryCompletion *compl,
       if (!g_file_info_has_attribute (info, "standard::file"))
         g_file_info_set_attribute_object (info, "standard::file", G_OBJECT (file));
 
-      return gtk_file_filter_filter (chooser_entry->current_filter, info);
+      return gtk_filter_match (GTK_FILTER (chooser_entry->current_filter), info);
     }
 
   return TRUE;

diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c
index b816c464e9a9d79d90902db6c22b101f42384812..66454f425583392d25ca6c218283d4c5275b2d7d 100644 (file)
--- a/gtk/gtkfilesystemmodel.c
+++ b/gtk/gtkfilesystemmodel.c
@@ -385,7 +385,7 @@ node_should_be_filtered_out (GtkFileSystemModel *model, guint id)
   if (!g_file_info_has_attribute (node->info, "standard::file"))
     g_file_info_set_attribute_object (node->info, "standard::file", G_OBJECT (node->file));
 
-  return !gtk_file_filter_filter (model->filter, node->info);
+  return !gtk_filter_match (GTK_FILTER (model->filter), node->info);
 }
 
 static gboolean